Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 28 Jul 2010 00:36:24 +0000 (00:36 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 28 Jul 2010 00:36:24 +0000 (00:36 +0000)
commit7063a0591e3d6535722bf15a4ea5b6c145254c07
treea7e6ef31e70cbbc6d0058b875d607c6a6c1048f6
parenteef6a0ba0d9eeba028a72f5d729803af326adb0c
parent47e2b005a61a8282c8c02ac602b05d69227e4125
Merge from mainline.